build: Add GSK deps to GTK
authorEmmanuele Bassi <ebassi@gnome.org>
Wed, 20 Apr 2016 15:00:45 +0000 (16:00 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Tue, 18 Oct 2016 10:29:34 +0000 (11:29 +0100)
gtk/Makefile.am

index 3b3ace51258cc0bbdfb5ec3d6bb9cc0e917b0960..4d94114a723a71cfa803f5720000c3ae8da7af6d 100644 (file)
@@ -27,6 +27,8 @@ AM_CPPFLAGS =                                         \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/gdk                             \
+       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/gsk                             \
        $(GMODULE_CFLAGS)                               \
        $(GTK_DEBUG_FLAGS)                              \
        $(GTK_WARN_CFLAGS)                              \
@@ -81,10 +83,12 @@ endif
 
 libadd =                               \
        $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gsk/libgsk-4.la \
        $(GMODULE_LIBS)                 \
        $(GTK_DEP_LIBS)
 deps =                                         \
-       $(top_builddir)/gdk/libgdk-4.la
+       $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gsk/libgsk-4.la
 
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
@@ -1531,7 +1535,7 @@ Gtk_4_0_gir_CFLAGS = \
                $(AM_CPPFLAGS) \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 Gtk_4_0_gir_FILES = $(introspection_files)
-Gtk_4_0_gir_LIBS = libgtk-4.la $(top_builddir)/gdk/libgdk-4.la
+Gtk_4_0_gir_LIBS = libgtk-4.la $(top_builddir)/gsk/libgsk-4.la $(top_builddir)/gdk/libgdk-4.la
 Gtk_4_0_gir_EXPORT_PACKAGES = gtk+-4.0
 INTROSPECTION_GIRS = Gtk-4.0.gir
 
@@ -1559,6 +1563,7 @@ gtk_query_immodules_4_0_SOURCES = queryimmodules.c gtkutils.c
 gtk_query_immodules_4_0_LDADD =                \
        libgtk-4.la                             \
        $(top_builddir)/gdk/libgdk-4.la         \
+       $(top_builddir)/gsk/libgsk-4.la         \
        $(GMODULE_LIBS)                         \
        $(GTK_DEP_LIBS)
 
@@ -1569,24 +1574,28 @@ gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
 gtk_encode_symbolic_svg_LDADD =                        \
        $(GDK_PIXBUF_LIBS)                      \
        $(top_builddir)/gdk/libgdk-4.la         \
+       $(top_builddir)/gsk/libgsk-4.la         \
        $(GTK_DEP_LIBS)
 
 gtk_builder_tool_SOURCES = gtk-builder-tool.c
 gtk_builder_tool_LDADD =                       \
        libgtk-4.la                             \
        $(top_builddir)/gdk/libgdk-4.la         \
+       $(top_builddir)/gsk/libgsk-4.la         \
        $(GTK_DEP_LIBS)
 
 gtk_query_settings_SOURCES = gtk-query-settings.c
 gtk_query_settings_LDADD=                      \
        libgtk-4.la                             \
        $(top_builddir)/gdk/libgdk-4.la         \
+       $(top_builddir)/gsk/libgsk-4.la         \
        $(GTK_DEP_LIBS)
 
 gtk_launch_SOURCES = gtk-launch.c
 gtk_launch_LDADD =                             \
        libgtk-4.la                             \
        $(top_builddir)/gdk/libgdk-4.la         \
+       $(top_builddir)/gsk/libgsk-4.la         \
        $(GTK_DEP_LIBS)
 
 if OS_WIN32